Merge "Defer remove splash screen window if it is inTransition." into udc-dev...

Merge "Defer remove splash screen window if it is inTransition." into udc-dev am: 778e47bb am: adddeb39

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



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