Merge "Merge "Remove bubbles if their shortcuts are removed or if the app is...

Merge "Merge "Remove bubbles if their shortcuts are removed or if the app is uninstalled." into rvc-dev am: 803d1971 am: d0370df4" into rvc-d1-dev-plus-aosp am: 2c710b14 am: e8c07bde

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

Change-Id: Ief888b81f5f61fadc29e16e7c754ccaad3af0e80