[automerger skipped] RESTRICT AUTOMERGE Defer remove splash screen while...

[automerger skipped] RESTRICT AUTOMERGE Defer remove splash screen while device is locked am: 691c9a4e -s ours

am skip reason: contains skip directive

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



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