Merge "Merge "Allow failing testUsbAccessory CTS test in some cases." into marshmallow-cts-dev am: 92576739ec am: f6466a9477 am: bf8a7a8873 am: 74cb6e4b59 am: 1dc943a6c8 am: e9d9266705 am: df1cb8526d am: 1e6118bc21 am: 0543e490a1 am: ed531d7016" into nyc-mr2-dev-plus-aosp