Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev am: 5c9dd5462f

Change-Id: I1f8d015508d8a9439778b64c2a9726f9251fc4c1