Merge "Fix switching a background task into split screen unexpectedly" into...

Merge "Fix switching a background task into split screen unexpectedly" into tm-dev am: 2a370961 am: 85edc358 am: 66ea425b

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



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