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

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



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