[automerger skipped] Merge "Dependency update for StateMachine" am: 5dc1edd9a8 am: 43f2693271 am: ac304f3709 am: b8a42d7b16 am: 1e130c77f5 -s ours

am skip reason: Merged-In I7499fad6c4c5076e2bd98f0d9f91c5f243fb1ed2 with SHA-1 35d5ca4159 is already in history

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

Change-Id: I595745591c7a9a5d1ddc069b414d2023d7e8a40b