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

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

Change-Id: Id8d4b4e39f183593276ffa5615acc5dca402df40