am 2e5528c5: (-s ours) Merge "Revert ActivityManager changes for tasks. DO NOT...
am 2e5528c5: (-s ours) Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev
* commit '2e5528c5':
Revert ActivityManager changes for tasks. DO NOT MERGE