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

[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: cc1a7bbc -s ours am: 363553a7 -s ours am: 59627314 -s ours

am skip reason: subject contains skip directive

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



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