Merge "Handle the uncontrolled task in split-screen" into tm-qpr-dev am: 9e737504 am: bef1e16c

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



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