Merge "Fix USB power regression when connecting USB headset during phone/voip...

Merge "Fix USB power regression when connecting USB headset during phone/voip call." into udc-dev am: 37ccbe73 am: 29e54ae4

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



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