[automerger skipped] Merge "RESTRICT AUTOMERGE Create separated tasks for...

[automerger skipped] Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into oc-mr1-dev am: 834e8809 -s ours am: da2c3df4 -s ours am: 6e298f64 am: b73ced79 -s ours am: 0be3fc84 am: 06b80d3d am: 663b7235 am: 7914befb

Change-Id: I87df3633f3cc5fa01b5cc2cb9577e80951ecd50e