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

[automerger skipped] Merge "Filter notification APIs by user" into rvc-dev am: b4ed0a34 -s ours am: 9aeec3e8 -s ours am: 8165fee9 -s ours

am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b85 is already in history

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

Change-Id: I7b87aee1ff8ff30ba5d0f611f5f67f2ebc670b16