Merge "Revert "decouple Bubble from NotificationEntry"" into rvc-dev am: 8f8af41376

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

Change-Id: Idd17c97db1d591e16da390f9d353f7003560df45