Merge "Dependency update for StateMachine" am: 5dc1edd9a8 am: 43f2693271 am: ac304f3709 am: b8a42d7b16

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

Change-Id: I43f89c5196a622b67a0bde9ea898517239f8021f