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

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

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

Change-Id: Idc99599d6aec4782a39f6962d481576f7b10a421