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

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



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