[automerger skipped] Defer remove splash screen while device is locked am: 45b17100 -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: Ib76e4b05b89949a3d007178584c751c3d54c1cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>