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

[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768c -s ours am: 29ddd832 -s ours

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

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



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