[automerger skipped] Merge "Fix flaky VibratorCallbackSchedulerTest" into main am: a8480cd22d am: e9e6f2e4a3 -s ours

am skip reason: Merged-In Id9501c10fe5209003d9b74b0f39f2bcf87de05c2 with SHA-1 c8069856c3 is already in history

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

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