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

Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d am: 2bfdf17d am: 439c0b00 am: 0441e7a7

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



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