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

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

Change-Id: I7c18afd86f475ebfb295af3f70060849d47cfe34