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

[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922 am: ece9f892 -s ours am: 5c21bd3c -s ours am: 54a9e88d -s ours am: baaedb5d -s ours am: 0f2ef46b -s ours am: a870bc84 -s ours

am skip reason: subject contains skip directive

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



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