Merge "Merge "Suppress bubble notifs instead of cancel" into rvc-dev am:...

Merge "Merge "Suppress bubble notifs instead of cancel" into rvc-dev am: 692e990f am: 2b1a5c17 am: 5badf69c" into rvc-qpr-dev-plus-aosp am: 04b1aac2

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

Change-Id: I0b0a7ac4015b28b16bd061229e3cee3699135fb7