[automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: 178be83f51 -s ours

am skip reason: skipped by user juliacr

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

Change-Id: I648912d92550081e0c2fc6fa11070ae5b8925984