[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 01ea2f91df am: 849979c2cd -s ours am: 68e2b3324a -s ours am: c856b3391d -s ours am: 15c0493bb6 -s ours am: 439180a160 -s ours

am skip reason: subject contains skip directive

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

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