[automerger skipped] Merge "RESTRICT AUTOMERGE Defer remove splash screen...

[automerger skipped] Merge "RESTRICT AUTOMERGE Defer remove splash screen while device is locked" into tm-qpr-dev am: 97780890 -s ours am: 168f40b4 -s ours

am skip reason: contains skip directive

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



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