[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: cd141a03 -s ours am: a71c9ea8 -s ours am: 3ee067c0 -s ours am: 8f78b0ac -s ours

am skip reason: subject contains skip directive

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



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