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

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

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



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