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

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



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