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