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: cce4aa25 am: a29779e4

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



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