Merge "Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest"