[automerger skipped] Merge "DO NOT MERGE Filter out suppressed notifications in entry manager" into rvc-d1-dev am: 448601b7 am: 019c408f -s ours

am skip reason: Change-Id I9b0fc0f48609b64371d3cb7677228b4bb1fa6aef with SHA-1 70a648c8 is in history

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

Change-Id: I9f48520544aa40624928ff8ce5b3c567f41b9ee4