Merge changes from topic "am-aa08c52499a2466eb19766aa6720769f" into main

* changes:
  [automerger skipped] Merge "Do not allow setting notification access across users." into tm-qpr-dev am: a200a009 -s ours am: 7f8355ae -s ours am: f973d9cb -s ours am: ccb67ec8 -s ours am: 2a377f2d -s ours
  [automerger skipped] Do not allow setting notification access across users. am: ee88e157 -s ours am: 22143857 -s ours am: 26fd08e1 -s ours am: 7ef08de5 -s ours am: e3301b37 -s ours