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