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: 9ec0a502

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



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