[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 4bc73341f6 -s ours am: 19150ff1da -s ours

am skip reason: subject contains skip directive

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

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