[automerger skipped] Merge "Remove dead code from NotifEntryManager" into...

[automerger skipped] Merge "Remove dead code from NotifEntryManager" into tm-qpr-dev am: bdd652e4 am: a28a5c46 -s ours

am skip reason: Merged-In If24a9a92c6af5c2edd4fe1b628bb720a6a12a311 with SHA-1 c785c4fa is already in history

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



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