[automerger skipped] Merge "Update battery list item string" into tm-qpr-dev...

[automerger skipped] Merge "Update battery list item string" into tm-qpr-dev am: 13b8dee0 am: 06d7a2fc -s ours

am skip reason: Merged-In I475e0183ddbf462433786f254ad6d62c8abaa0bd with SHA-1 918deaf2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20579931



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