[automerger skipped] DO NOT MERGE Filter out suppressed notifications in entry manager am: b88b1b68 am: d6d9c23f -s ours am: 161b7e17 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I27f8c47e9061fed641c7244e522644d4147bfffc