Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d am: 4eabcdea am: 9ec0a502 am: 5ceb227f

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



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