[automerger skipped] Merge "Defer remove splash screen while device is locked" into udc-qpr-dev am: 771316d8 -s ours

am skip reason: Merged-In Ia2ddece125521eefb15d67e22ea863dfae6af112 with SHA-1 0c7daa8c is already in history

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



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