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