[automerger skipped] DO NOT MERGE Filter out suppressed notifications in entry manager am: b88b1b68ad am: d6d9c23f3d -s ours

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

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

Change-Id: I297bbe01326f9572ab713221675aea8232e69386