[automerger skipped] Merge "Fix vts sco test fail for usb interface" into...

[automerger skipped] Merge "Fix vts sco test fail for usb interface" into stage-aosp-udc-ts-dev am: bcd8ee70 am: 4ba38df7 am: 165f6b55 am: d9fa0502 -s ours

am skip reason: Merged-In Idb150d8a72149f7e1dfaccfd7bc82a91710da59c with SHA-1 360c71dd is already in history

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



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