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

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

Change-Id: Ia520d17c202378dd731110919c7a0bed2cac0fb8