[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup...

[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 6aa884d6 -s ours am: b602525e -s ours am: 06a01901 -s ours am: 7390787d -s ours am: 2f9e12e5 -s ours

am skip reason: subject contains skip directive

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



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