Merge "Merge "decouple Bubble from NotificationEntry" into rvc-dev am: 7fc567f7a3 am: 2aab9277e0 am: 9af65ebb9e" into rvc-qpr-dev-plus-aosp