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

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

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