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

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



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