Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e am: 1352c72005 am: 81bc2c00cc am: 504e408398
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539 Change-Id: I3b8a68f04b1760365ae4773d630c51febc30b9bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: