Merge "Merge "Fix split cannot active if app trampoline launch new task" into...

Merge "Merge "Fix split cannot active if app trampoline launch new task" into tm-qpr-dev am: f3f4b85e am: 98ca6ac8" into udc-dev-plus-aosp am: fcc83cb6 am: 28785f9a am: ce59cf9d

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



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