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

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



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