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

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

Change-Id: Ia1818431f00bd848377a52bba9c916a23a2eddd6