[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: 4ad0cd9b am: 9560e0b7 -s ours

am skip reason: subject contains skip directive

Change-Id: I195e2bff8a56bea92a9b11e55b48198a4eb7b548