Merge "Merge "Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev am: 7ca0ea68 am: db112f6b" into rvc-d1-dev-plus-aosp am: 5d11e440" into rvc-qpr-dev-plus-aosp am: ce6e4d5b

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

Change-Id: Ifef74c0b1dbc048a27035b5b92addb30120d9bba