Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9 am: 648266e8 am: 8aad80fe am: 85c1ead6

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



Change-Id: I6931da484945fb8be8024399b4a3378cda438ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>