Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into udc-dev am: 12ba8d5011

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

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