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

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



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