Merge "Fix vts sco test fail for usb interface" into main am: 98e165d1f6 am: 040bf58a56 am: 1891065c68 am: 908a20b3cd

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

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