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

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



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