Merge "Allow failing testUsbAccessory CTS test in some cases." into marshmallow-cts-dev am: 92576739ec am: f33d903b35
am: 5ee5813802

Change-Id: Ic363dfcf476f7e423008a3174eb1a6d57d8e4ba3