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

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

Change-Id: If3e540bcfd6c35545d4dbdf7d67960f5b97f933f