Merge "Fix USB power regression when connecting USB headset during phone/voip call." into udc-dev am: 37ccbe7384 am: 1243723588 am: 55d0bf7d9f am: 02223b2b22
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23810764 Change-Id: Ia688cea718ea00e2fcb2c471358bdd8cd4e0dae8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: