Merge "[Shell Transition] Defer remove splash screen window when it is...

Merge "[Shell Transition] Defer remove splash screen window when it is inTransition." into tm-qpr-dev am: 9394254f

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



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