[automerger skipped] Merge "When applying a RankingMap that lacks an entry,...

[automerger skipped] Merge "When applying a RankingMap that lacks an entry, remove that entry from the NotifCollection." into tm-qpr-dev am: c6701d96 am: cfbdcf91 -s ours

am skip reason: Merged-In Id897c8761e40fd1adedd7c9e5a7bd2f9467d13ed with SHA-1 b49ad248 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18366674



Change-Id: I269cfc18f97bb280f42d9fefae7a8bd2dd492cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>