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

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



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