Merge "Fix flaky test...

Merge "Fix flaky test VibrationThreadTest#vibrate_multipleVibrations_withCancel" into main am: 789efc98

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



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