Merge changes from topic "presubmit-am-eff2a387dc434e1ab6d0febedea6b507" into sc-qpr1-dev

* changes:
  [automerge] Filter notification APIs by user 2p: 40ca868ca5
  Filter notification APIs by user