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

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



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