Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3 am: 03d0a3aeff" into nyc-mr1-dev-plus-aosp
am: 3b5aac257b

* commit '3b5aac257bd9092de4c552ac095d5cbf7109a9b7':
  Handle trampoline activites in different tasks

Change-Id: I369dc499ac8edadf3a3ec0fe3bfce23753331268