[automerger skipped] Merge "Filter notification APIs by user" into sc-dev am: 1db370eac3 -s ours am: e127a68093 -s ours am: 308ed847d4 -s ours am: bde1eae8b5 -s ours

am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history

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

Change-Id: I9004f4d387ffb9ccfe6a960f409985d3de3658f5