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: b5682235 am: ef264fb3 am: 31d2f2b7

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



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