[automerger skipped] Filter notification APIs by user am: 4d7ca1db -s ours...

[automerger skipped] Filter notification APIs by user am: 4d7ca1db -s ours am: e7493443 -s ours am: c6e84150 -s ours am: 3837076d -s ours am: 5a1cf350 -s ours am: 178be83f -s ours am: d97b8a0a -s ours

am skip reason: skipped by user juliacr

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

Change-Id: I2ca0689feca01711e83dbfb87659172efd8885d9