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