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 am: c5315a9c

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



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