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

* changes:
  [automerged blank] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" 2p: b37e4e7e6f
  Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"