Merge "RESTRICT AUTOMERGE Add test of startActivities with different uids" into oc-dev am: 568a1a45ec

Change-Id: Id20650f8b118d590f6af23de044f0e8d5867cf34