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

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



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