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: 30a0204c am: 5cf2ec43

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



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