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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21706160



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