[automerger skipped] Merge "Fix vts sco test fail for usb interface" into stage-aosp-udc-ts-dev am: bcd8ee707d am: 4ba38df718 -s ours am: 40195a8913 -s ours am: 9300a33b38 -s ours am: 03651f86f0 -s ours

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

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

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