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

[automerger skipped] Merge "RESTRICT AUTOMERGE Defer remove splash screen while device is locked" into tm-dev am: eaf6e716 am: 86dd3d96 am: 07700203 -s ours am: b9a87a9c -s ours am: ec2e2fe6 -s ours am: fb23162c -s ours

am skip reason: contains skip directive

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



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