[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 -s ours am: 8682af18 -s ours

am skip reason: Merged-In Idb150d8a72149f7e1dfaccfd7bc82a91710da59c with SHA-1 4e85c099 is already in history

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



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