[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 skip reason: Merged-In I8e33db8eb6e2c917966cab3d6a4f982670473040 with SHA-1 448f1b18 is already in history

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



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