Merge "Fix not able to start a shortcut into split" into tm-qpr-dev am: f3e52f55 am: 40bc6576

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



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