Merge "Revert "[Settings] Resolves unsynced infomation between status bar and settings"" into tm-dev am: 6b9a904500

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

Change-Id: I0eee5b81671b29e6ced07b9d8b3c69e4bbe504b5