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

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

Change-Id: I2d57128512ecfa6a38ac74c2d176bcd85ace42e2