Merge "Intercept activity start requests in client organizer" into sc-v2-dev...

Merge "Intercept activity start requests in client organizer" into sc-v2-dev am: 94a6a10f am: 8a3e6496

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

Change-Id: I375bb0707edfb319998bff3be95555b067076897