[automerger skipped] DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps am: 323ce62057 am: 35c443bd0a am: a512e6473b am: 874302f4dc -s ours
am skip reason: subject contains skip directive

Change-Id: Ic95560ffd37cdfb20b0e4c72b3b3387b57ca24de