[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into rvc-dev am: ef02392991 am: 97ed96529a -s ours am: bc476c7458 -s ours am: b4e7146d59 -s ours am: 15176a4fa8 -s ours am: d7e378f1cf -s ours am: 9c643e5ff4 -s ours am: c864aed853 -s ours am: d2d9e513f0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24413973 Change-Id: I8ff1648bdbde28a7ac2e9d3acdc11f0a8832168f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: