[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 01ea2f91 am: 849979c2 -s ours am: 68e2b332 -s ours am: c856b339 -s ours am: 15c0493b -s ours am: 439180a1 -s ours am: a80d2716 -s ours am: c3e521c5 -s ours am: a1a73402 -s ours am: 970ca74b -s ours

am skip reason: subject contains skip directive

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



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