[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: 9ace9065 -s ours am: 89693bef -s ours

am skip reason: subject contains skip directive

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



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