Merge "Fix broken transition when caceling enter split screen" into tm-qpr-dev...

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

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



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