[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-qpr-dev am: 9c966b813f -s ours am: 7db9c570db -s ours am: dc2591f5b9 -s ours am: f757854287 -s ours am: 52cf69add9 -s ours

am skip reason: subject contains skip directive

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

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