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

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

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