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

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

Change-Id: I8dc9162d644d7f9dd11e4e26a084d9ccb158dc63