Merge "Fix not able to enter split screen with trampoline launch" into...

Merge "Fix not able to enter split screen with trampoline launch" into tm-qpr-dev am: 71c5174a am: 7009226a

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



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