[automerger skipped] Merge "Filter notification APIs by user" into rvc-qpr-dev...

[automerger skipped] Merge "Filter notification APIs by user" into rvc-qpr-dev am: 0ffd6000 -s ours am: 2dfb7bbb -s ours am: 4e750d06 -s ours am: c429e14f -s ours

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

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

Change-Id: Icd2394a2b5306ce5caf20a9d94e24cfd3858d460