[automerger skipped] Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into oc-mr1-dev am: 834e880978 -s ours am: da2c3df4ce -s ours am: 6e298f6477

Change-Id: I8e00dfcdb01121674b49d45ddf492b570b3cfc05