Merge "Update incompatible charging string based on UXR suggestion" into...

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

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



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