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: Ice09e7200bbc0bff6fba713be8b38ea1fbb072b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>