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

Merge "Update incompatible charger checking rule" into udc-dev am: 82a93d6a am: 9afcd1d5 am: 3d642392 am: cf1e872a

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



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