Merge "Skip UsbAccessory test on non-handheld devices" into marshmallow-cts-dev