Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev