Merge "Update incompatible charger checking rule" into udc-dev am: 82a93d6a...

Merge "Update incompatible charger checking rule" into udc-dev am: 82a93d6a am: 91c3cd38 am: bb0f7ba7 am: c4daf721

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



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