[automerger skipped] Merge "Filter notification APIs by user" into rvc-qpr-dev am: 0ffd60007c -s ours am: 2dfb7bbbed -s ours am: 0e8c0d8b0e -s ours am: 14a350285e -s ours am: 08b798aeaa -s ours am: a79b20a844 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873353
Change-Id: I18da017f06281258a551e280b1602d3dfec5ebd2
This commit is contained in: