[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 skip reason: subject contains skip directive

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



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