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: 2624f61f" into rvc-d1-dev-plus-aosp am: 71f1b34e am: 39da9295

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

Change-Id: Ib96701e6232395bbbe8fecaa8b0e152475c609b2