[automerger skipped] Merge "Check for the vibrate notification key on delayed...

[automerger skipped] Merge "Check for the vibrate notification key on delayed vibrations" into sc-v2-dev am: 55d2c4c1 am: 59b95d43 -s ours

am skip reason: Merged-In If3ed4a741e78058a321691acebe735c735542f16 with SHA-1 2bf7f520 is already in history

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

Change-Id: I2aef125e4722d044e397bf5aeb5a9e1fdcca84bb