Merge "Fix vts sco test fail for usb interface" into stage-aosp-udc-ts-dev am:...

Merge "Fix vts sco test fail for usb interface" into stage-aosp-udc-ts-dev am: bcd8ee70 am: 4ba38df7 am: 165f6b55

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24117228



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