Merge "Add a mechanism to disable the incompatible charger warning" into...

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

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



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