[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: b79f458b -s ours

am skip reason: contains skip directive

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



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