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

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



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