Merge "Add fallback logic to cancel entering split screen" into tm-qpr-dev am: b8a27eb6

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



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