[automerger skipped] Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev am: 5c9dd5462f am: ab5e7a775e am: b303a271c5 am: cd7920d2cc -s ours
am skip reason: subject contains skip directive

Change-Id: Idafda0d3a433a6a4bb4492c3b4f5a3e963b252d4