Merge "Merge "Revert "decouple Bubble from NotificationEntry"" into rvc-dev am: 8f8af41376 am: 00e32c11b9" into rvc-d1-dev-plus-aosp