Merge changes from topic "am-26ce1235c45041ea8a34daec378686c9"

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-711e8625e1514f8785791e865e5a4d7d" into sc-qpr1-dev am: 90986f86 am: 8b14f74f am: a03633e0 am: 9f6d03dd -s ours
  [automerger skipped] [automerge] [RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege 2p: fa8d6362 am: a3c8ce88 -s ours am: aae1149c -s ours am: 85ef7546 -s ours am: cf933ef0 -s ours