[automerger skipped] Filter notification APIs by user am: 24076b85 -s ours...

[automerger skipped] Filter notification APIs by user am: 24076b85 -s ours am: ed4b77db -s ours am: e3cbde3d -s ours am: b586eba4 -s ours am: d642552a -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/+/16873353

Change-Id: Ib1fc2ef02d980141ed7abf668332d73a81e8da2b