Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev am: aee2d55b

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



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