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

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



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