Revert "Remove the bubble if the notification is no longer FLAG_BUBBLE"

This reverts commit 34a3073c.
Bug: 128459529
Reason for revert: I bypassed treehugger but after looking at all the test failures some of them might have been me

Change-Id: I5e34001a3340610a86ab5d9f6ffd29ef6ecd7b39