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

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

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



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