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

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



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