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

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



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