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

Change-Id: Ia5a0d75f8dcfc67357442c534bd006245b8014fe