Merge "Call entry clean up when removing pending entries"

            NotificationEntry entry = mPendingNotifications.get(key);

            entry.abortTask();

            mPendingNotifications.remove(key);

            for (NotifCollectionListener listener : mNotifCollectionListeners) {

                listener.onEntryCleanUp(entry);

            }

            mLogger.logInflationAborted(key, "pending", reason);

        }

        NotificationEntry addedEntry = getActiveNotificationUnfiltered(key);