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

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



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