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: 47243518

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



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