Merge "Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest" am: c9ed425df2 am: 1b148ed131 am: 130599d186 am: 15ccd2c588

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918645

Change-Id: I8ca688eaeb2f3f4a34a5bcffa40fca88051e341c