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

Merge "Remove plug/unplug condition for the incompatible charging state" into udc-dev am: 13c45249 am: 42509b75

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22611216



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