Only remove bubbles with null shortcutinfo if they have a shortcut ID.

Test: manual
Bug: 159719877
Change-Id: Ia46240884b0c8824e03fbcc5c24e0aa8dbb94301
1 file changed