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

[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 448f1b18 am: 758fa93f -s ours am: 47eb031a -s ours

am skip reason: Merged-In I8e33db8eb6e2c917966cab3d6a4f982670473040 with SHA-1 deba34cc is already in history

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



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