[automerger skipped] Merge "Filter notification APIs by user" into sc-qpr1-dev...

[automerger skipped] Merge "Filter notification APIs by user" into sc-qpr1-dev am: 39eca8ab -s ours am: 4260e7b2 -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/+/16873192

Change-Id: I328622757e32bacee3693e167efb285004454932