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

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



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