[automerger skipped] Merge "Allow VISS to start assistant activity with...

[automerger skipped] Merge "Allow VISS to start assistant activity with ActivityOptions" into udc-dev am: c00fb6ad -s ours

am skip reason: Merged-In I5d7f4bd22842b12bcbf08dbc0188eea3f0b262ff with SHA-1 0804b6e2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21476025



Change-Id: I20ffbce8da6acc0850e818a2cbfd134cf7c7f290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>