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

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

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