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

Change-Id: I6e2f964cc85caa430ca5aa28986fcb65e416a033