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 am: d8b55868" into rvc-qpr-dev-plus-aosp am: e51cae0a

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

Change-Id: Ibec311fdaceed01d54ba06f5217a506079025ffc