Merge "Support starts a pair of intent/shortcut and task to split" into...

Merge "Support starts a pair of intent/shortcut and task to split" into tm-qpr-dev am: 3750d894 am: 04854d78

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



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