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

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



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