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: Ic42b12957b18d1bb54a84806ace41f30ae23b437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>