Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev...

Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead am: f8c5e735 am: 3cc252d0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888

Change-Id: I9c980a22288911a41798fa6c765fddb0c4f0b131