[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 6aa884d6c5 -s ours am: b602525e4f -s ours am: 3d45e1a4a7 -s ours am: 0d2572f403 -s ours am: d0d1cf3fe4 -s ours

am skip reason: subject contains skip directive

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

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