Merge "Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev am: 7ca0ea68 am: db112f6b am: b8040271" into rvc-qpr-dev-plus-aosp am: 8e0aeb54

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

Change-Id: I35f6e051378607811338945bfe5975f7a90f681b