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

* changes:
  [automerge] [RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege 2p: fa8d636234
  [RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege