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

Merge "Suppress bubble notifs instead of cancel" into rvc-dev am: 692e990f am: a8c29c9f am: aeb70210 am: 5fda35c7

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

Change-Id: I207313ebfbc6356c75af72215982d7dce28e547e