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