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

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



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