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: 88fa4352

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



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