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

[automerger skipped] RESTRICT AUTOMERGE Defer remove splash screen while device is locked am: 99563107 am: 6b037b42 am: 44d2ee07 -s ours am: 6c60f2f4 -s ours

am skip reason: contains skip directive

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



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