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

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



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