[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 6aa884d6c5 -s ours am: b602525e4f -s ours am: 06a01901f8 -s ours am: 7390787dff -s ours

am skip reason: subject contains skip directive

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

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