Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3 am: 1833aafe7f" into nyc-mr1-dev-plus-aosp
am: fef5288111
* commit 'fef52881119f07c1d6bd928ac5e172680b8dc468':
Change-Id: Iba5ccc8aba6410b2890bd52a78d897092c139712
This commit is contained in: