Merge "Add a mechanism to disable the incompatible charger warning" into udc-dev am: d699207d am: d7514656

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



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