[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 6aa884d6c5 -s ours

am skip reason: subject contains skip directive

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

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