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

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



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