Merge "Merge "Allow failing testUsbAccessory CTS test in some cases." into marshmallow-cts-dev am: 92576739ec" into nougat-cts-dev am: 0ec74f6532 am: 072dc192cc
am: eb63ddf855

Change-Id: I14f1cbd8eae8fff8151e23cd843241a3a62c8c30