DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 01ea2f91df

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

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