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

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

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