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

am skip reason: subject contains skip directive

Change-Id: Ia60fe54c770e6aac0206217ecf6f9cc4ea48a2e4