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

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

Change-Id: I7b36b034cb04417c4925e9d2bcc3ef33b0b2f0c6