Merge "Support starting a shortcut into multi-instances split" into tm-qpr-dev am: ef6ec086

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



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