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