Merge "Reduce flicker while split entering animation" into tm-qpr-dev am: 455985f9 am: 722b72ad

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



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