Merge "Revert "Improve enter split transition"" into tm-qpr-dev am: 9e6b8ad6

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



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