Revert "decouple Bubble from NotificationEntry"

This reverts commit d07c2deaf035e8aae86fa5f0b11ef36d237d653a.

Reason for revert: debug test failure in b/158986168

Bug: 158986168
Change-Id: I10cb613e4f160561c06944aebccaf16c090bcd9e
19 files changed