Merge "Merge "Revert "decouple Bubble from NotificationEntry"" into rvc-dev am: 8f8af413 am: 00e32c11" into rvc-d1-dev-plus-aosp am: 2fa84a36

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

Change-Id: Ia850d305667f990a601f5b138635d9050eb4a87c