tree 1a5ba18b64c4728eb83a348cdc894051ddf520ff
parent e86bb3b32d4895e72eee9e551464060eb6d7ef47
parent 363553a7a01d38a286a26c49f1aa03fe0f35a87f
author Aaron Liu <aaronjli@google.com> 1692637589 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692637589 +0000

[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: cc1a7bbc05 -s ours am: 363553a7a0 -s ours

am skip reason: subject contains skip directive

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

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