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

Change-Id: Id3f2a8481a9d897bb315f97bd43d9133683618e9