Merge "Merge "Fix Wifi state not updated while connecting" into rvc-dev am:...

Merge "Merge "Fix Wifi state not updated while connecting" into rvc-dev am: a8e80822 am: d87b34b3 am: d6f8ee0c" into rvc-qpr-dev-plus-aosp am: 529f00c8

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

Change-Id: I902535cc7ccd3985cd388da55ebc0d4d40f8e647