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: I8cd628ecb420988757fcfa4d374506200d8f126d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>