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

[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81 am: ace3f5c8 -s ours

am skip reason: subject contains skip directive

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



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