DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81

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



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