[automerger skipped] Filter notification APIs by user am: 3456555b7c -s ours am: 4372e063b7 -s ours am: a905b405bf -s ours am: 0ae8eee99e -s ours

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

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

Change-Id: I958a13dd082a9fc162e84beb07cd1bc752adad22