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