Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev am: 7ca0ea6869

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

Change-Id: I981905f477963c8001225fdaa21b8359d12fd304