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

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



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