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

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



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