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: fa6b3fc8

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



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