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

[automerger skipped] Merge "Filter notification APIs by user" into sc-dev am: 1db370ea -s ours am: e127a680 -s ours am: 308ed847 -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/+/16873352

Change-Id: Ice20f16742175049a8a4adc1532f2214287ed627