Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda9...

Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda9 am: 93ab64ef am: 33ba3912 am: 01624257

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



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