[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: 68af1ce6 -s ours am: 9e5e6c87 -s ours

am skip reason: subject contains skip directive

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



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