DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps am: 323ce62057

Change-Id: I83100c671931304bc515fb9b4510e5df251b8288