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

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



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