[automerger skipped] [automerge] Filter notification APIs by user 2p: 40ca868ca5 am: 9b088d5e57 -s ours am: c6e49d66ad -s ours

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

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

Change-Id: I261d0ea38df0592e56f68e5c007edfef6dc14862