[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours

am skip reason: subject contains skip directive

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

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