Merge "Update vibration cancellation policy for notifications" into tm-qpr-dev...

Merge "Update vibration cancellation policy for notifications" into tm-qpr-dev am: 88efc6f7 am: cb0e9370

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



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