[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 am: b73ced79ec -s ours am: 0be3fc8477

Change-Id: Idf20484339cd930b5926f603e273a864b5657d82