[automerger skipped] Merge "Allow upcoming vibration when current one if being...

[automerger skipped] Merge "Allow upcoming vibration when current one if being cancelled" into tm-qpr-dev am: bb4867b6 am: 647049e0 -s ours

am skip reason: Merged-In I8151d9ee0e30b7115e9cb3d6bcd272da2806b45c with SHA-1 546dd659 is already in history

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



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