Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9

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



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