[automerger skipped] [automerge] Filter notification APIs by user 2p: 40ca868c am: 9b088d5e -s ours

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

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

Change-Id: I37c28f260fad7cdecfea570717f3d60230ef9f7f