Merge "Fix dialer bubbles not bubbling / remove alertAgain logic" into qt-dev

import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

import static com.android.systemui.statusbar.StatusBarState.SHADE;

import static com.android.systemui.statusbar.notification.NotificationAlertingManager.alertAgain;

import static java.lang.annotation.RetentionPolicy.SOURCE;

            if (!shouldBubble && mBubbleData.hasBubbleWithKey(entry.key)) {

                // It was previously a bubble but no longer a bubble -- lets remove it

                removeBubble(entry.key, DISMISS_NO_LONGER_BUBBLE);

            } else if (shouldBubble && alertAgain(entry, entry.notification.getNotification())) {

            } else if (shouldBubble) {

                updateShowInShadeForSuppressNotification(entry);

                entry.setBubbleDismissed(false); // updates come back as bubbles even if dismissed

                updateBubble(entry);