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

Change-Id: Ie33f1236f871d681d8d2750b7844fcf5b3559b95