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: 648266e8

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



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