[automerger skipped] Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into pi-dev am: d9d727b959 -s ours am: 5d7dd7b2dd

Change-Id: I20cf8aa0f71394ba848f3b961868434dffa74008