Merge "Allow upcoming vibration when current one if being cancelled" into tm-qpr-dev am: bb4867b6

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



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