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

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

Change-Id: Ided85281b0336bf155bea9d1d38aa0c6eb0ae2d1