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: I2d22ac5a25c165685e52907ffe529a093bc3771a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>