Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd8

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



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