[automerger skipped] Merge "Filter notification APIs by user" into sc-v2-dev am: 010d965e -s ours am: e9d179be -s ours

am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 73745b16 is already in history

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

Change-Id: I19c0e830a69666c92fedbc1c297201ead6d694c8