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

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

Change-Id: Ifb356103d93cdfacaf3788d982784aea5f34f4a6