Merge "Allow failing testUsbAccessory CTS test in some cases." into marshmallow-cts-dev am: 92576739ec am: f6466a9477 am: bf8a7a8873
am: 74cb6e4b59

Change-Id: I674d698329aafdee1de8f9c9c962923a4da4383b