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

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

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