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: I26d8b679b5783c6b86128ec9ac91a54592854f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>