[automerger skipped] Merge "Skip UsbAccessory test on non-handheld devices" into marshmallow-cts-dev
am: 0fe2ff9e77  -s ours

Change-Id: I8352606b4e1af411d8fcfcde5061aa6ba0870853