Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into rvc-dev