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: 83692baf

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



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