Merge "Fix broken transition when caceling enter split screen" into tm-qpr-dev am: 1520689a

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



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