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