Merge "Skip some Sony hid tests for older kernels" into sc-dev