[automerger skipped] Merge "RESTRICT AUTOMERGE Add test of startActivities with different uids" into oc-dev am: 568a1a45ec am: c4d10955b8 am: 1b4b93ecf8 -s ours

am skip reason: subject contains skip directive

Change-Id: Ic75ac395f9ed90c9c7b4505c3b3da48a1c294460