Merge "Merge "Wifi use state machine from modules-utils" into...

Merge "Merge "Wifi use state machine from modules-utils" into stage-aosp-master am: 49d0f678 am: 053a8ac5 am: d603b64f" into sc-v2-dev-plus-aosp am: 7025a6c2

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

Change-Id: I17fb7d7d4fcd7a6fa217d0d2d4d3ff689348a1c4