[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when...

[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-qpr-dev am: 9c966b81 -s ours am: 7db9c570 -s ours am: dc2591f5 -s ours am: f7578542 -s ours

am skip reason: subject contains skip directive

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



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