[automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: cc1a7bbc05 -s ours am: 363553a7a0 -s ours am: 9ace9065e2 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24415597 Change-Id: I748db048bad4c4f0761d9f5a6d8e5f7d5784ef52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: