Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev
am: 3af59ef42c

* commit '3af59ef42c83fbe4bf9e54f807597bddc6aa7ecd':
  Internal API for cross-task Activity used by assistant.

Change-Id: Idb8c49437ff7d151e186edd2112e4def8d7a7e15