Merge "Usb non-compliant port partner aidl extension"