Merge "When applying a RankingMap that lacks an entry, remove that entry from...

Merge "When applying a RankingMap that lacks an entry, remove that entry from the NotifCollection." into tm-qpr-dev am: c6701d96

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



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