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

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



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