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 am: b7b13ceb

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



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