[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: 29ddd8326a -s ours am: 4cd1d533ae -s ours am: f95ef389ae -s ours am: 2370478bdf -s ours am: f586478aa6 -s ours am: 703243d7c8 -s ours

am skip reason: subject contains skip directive

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

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