tree 7567a4b16ca63ea07016fcf2245b70359dff5dad
parent a870bc848f9413f96f3e5748ff66bcd0017a6e40
parent 4bc73341f69302a7b742b8154cf644dff7cc80ca
author Aaron Liu <aaronjli@google.com> 1692910188 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692910188 +0000

[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 4bc73341f6 -s ours

am skip reason: subject contains skip directive

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

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