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

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



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