Merge "Remove plug/unplug condition for the incompatible charging" into...

Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef0040 am: f2e7f45f

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



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