Merge "Merge "Internal API for cross-task Activity used by assistant." into...
Merge "Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev am: 3af59ef4" into nyc-mr1-dev-plus-aosp
am: 74babe67
* commit '74babe67':
Internal API for cross-task Activity used by assistant.
Change-Id: I985c67a465e88f74e66600709c187c3dfc9734e9