Merge "Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev am: 7ca0ea6869 am: db112f6bc8" into rvc-d1-dev-plus-aosp am: 5d11e44057
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11977430 Change-Id: I059c6423161a83b71a102f408eb34b2824d20876
This commit is contained in: