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

am skip reason: subject contains skip directive

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



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