Merge "Fix vts sco test fail for usb interface" into stage-aosp-udc-ts-dev