[automerger skipped] Merge "Wifi use state machine from modules-utils" am:...

[automerger skipped] Merge "Wifi use state machine from modules-utils" am: af88579f -s ours am: ec3d9e84 -s ours am: 2d53b50d -s ours am: a39c4030 -s ours am: 549d62d5 -s ours

am skip reason: Merged-In I2087b15cf34b76dabeb14d51d041533f55e1b5ba with SHA-1 b52b48c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1831873

Change-Id: If27ead65b30ddf21282103f29aec4f33bb7d8682