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

Change-Id: I4d72d48bf266f00358802f3dc7f0a162865d0a70