Merge "Fix flaky VibratorCallbackSchedulerTest" into main am: a8480cd22d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3064303

Change-Id: I08da374ad0c5e34137ae2fb70d57896d0f5fb61b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>