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

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

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



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