[automerger skipped] Merge "Defer remove splash screen while device is locked"...

[automerger skipped] Merge "Defer remove splash screen while device is locked" into udc-dev am: 933438c6 -s ours am: 744cabbc -s ours

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

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



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