Merge "Support incompatible charger state in the Settings main page" into...

Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f4 am: 1352c720 am: 81bc2c00

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



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