Merge "Revert "Trim the activity info of another uid if no privilege"" into tm-qpr-dev