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

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

Change-Id: I741c1c4a8f102bbd67b578acf131acbd6d67efb6