Merge "Support launching a shortcut and a task to split screen" into tm-qpr-dev am: e481b384

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



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