Merge changes from topic "am-de4173b23fc4434aa64198c19b9e93fd"
* changes:
[automerger skipped] Merge "Allow VISS to start assistant activity with ActivityOptions" into udc-dev am: c00fb6ad -s ours
[automerger skipped] Allow VISS to start assistant activity with ActivityOptions am: a846aee9 -s ours