Merge "Fix split cannot active if app trampoline launch new task" into tm-qpr-dev am: f3f4b85e

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



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