[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: 4cd1d533 -s ours am: f95ef389 -s ours

am skip reason: subject contains skip directive

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



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