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: 55d0bf7d

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



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