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: 240fffc9

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



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