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