tree a6771d4d399aabf9e62409d1132dccd6c28f2805
parent 9867f828f030ff4f9f2679e67a1f178f5ef19be6
parent b602525e4f67e928c512053c185f6869a9f450ed
author Aaron Liu <aaronjli@google.com> 1699652798 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699652798 +0000

[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 6aa884d6c5 -s ours am: b602525e4f -s ours

am skip reason: subject contains skip directive

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

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