Merge "Update Settings charging string" into tm-qpr-dev am: 4909c792 am: 7ffe4ed6

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



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