Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922

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



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