Merge "Merge "Revert "decouple Bubble from NotificationEntry"" into rvc-dev am: 8f8af413 am: 6756cf69 am: c047ac7a" into rvc-qpr-dev-plus-aosp am: 4f9ce77d

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

Change-Id: I554498802027781ebf8f3b054e104e67affd647b