Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e6

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



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