[automerger skipped] Merge "Fix flaky test...

[automerger skipped] Merge "Fix flaky test VibrationThreadTest#vibrate_multipleVibrations_withCancel" into main am: 789efc98 am: 20757be6 -s ours

am skip reason: Merged-In I80dd468c9f31a1676e38b24766388934a6f03fa7 with SHA-1 e52f0538 is already in history

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



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