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

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

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



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