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

am skip reason: skipped by user juliacr

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

Change-Id: Ic580d121962d8dc16006587c1bab71e49f35aecf