Merge "Add a mechanism to disable the incompatible charger warning" into...

Merge "Add a mechanism to disable the incompatible charger warning" into udc-dev am: d699207d am: f8a729e2 am: 6aff2b2e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23297246



Change-Id: I2661a3fef5fb04a20137406dab5ca393c4ad88ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>