[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when...

[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into udc-dev am: 12ba8d50 am: e86bb3b3 -s ours

am skip reason: Merged-In I8e33db8eb6e2c917966cab3d6a4f982670473040 with SHA-1 448f1b18 is already in history

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



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