Merge "Wifi use state machine from modules-utils" into stage-aosp-master am:...

Merge "Wifi use state machine from modules-utils" into stage-aosp-master am: 49d0f678 am: 053a8ac5

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

Change-Id: Ida59c06c05c85fbfd9b4a574654af51da0c41ee6