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

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

Change-Id: I79957cef106bd9fc5a8e1769df80b81e6dfbad36