Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765c am: 03d0a3ae" into nyc-mr1-dev-plus-aosp