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

[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992 -s ours am: 4bc73341 -s ours am: 19150ff1 -s ours am: c99f704d -s ours am: da2b449f -s ours

am skip reason: subject contains skip directive

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



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