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

Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d am: 4eabcdea am: 6f892d20 am: 748a9d22

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351



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