Merge "Merge "Allow failing testUsbAccessory CTS test in some cases." into marshmallow-cts-dev am: 92576739ec am: f33d903b35 am: 5ee5813802 am: 5ade2526c6 am: 4a4968bd56 am: 0e276a39c6 am: 28215187d3" into nyc-mr2-dev-plus-aosp