Merge "Dependency update for StateMachine" am: 0999fd2063 am: 5171e84c3a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1800996

Change-Id: I282d96b8e8d487e79d23cf068126827de609700c