Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b
am: c1607192c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565 Change-Id: I8c7674799e4dbf46957699cba13d27b058c686e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: