Merge "Ensure finish lockscreen when usersetup incomplete" into udc-qpr-dev...

Merge "Ensure finish lockscreen when usersetup incomplete" into udc-qpr-dev am: f8b2f9be am: b655ad24

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



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