[automerger skipped] Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev am: aee2d55bfa am: 240ff56875 -s ours
am skip reason: Merged-In Ib316e9fecac60f388e2b1810de9a65c540c52358 with SHA-1 1cf801e793 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410009
Change-Id: I0c683c4b8b25a938bbec9dd6ebc3d9cdc93ed5d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: