Merge "Revert "Internal API for cross-task Activity used by assistant."" into...
Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev am: fe3ecdab
am: abb74889
* commit 'abb74889':
Revert "Internal API for cross-task Activity used by assistant."
Change-Id: Id397afe9221e2562e096befc1b105233618ca7ef