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: 12437235 am: ec485c14

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



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