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 am: f2b23125

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



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