Merge changes from topic "am-1c09b97641184f4390a7f3836d5c973c" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into rvc-dev am: ef023929 am: 97ed9652 -s ours am: bc476c74 -s ours am: b4e7146d -s ours am: 15176a4f -s ours am: d7e378f1 -s ours am: 95f9c4fb -s ours am: dce529a1 -s ours am: 840c2078 -s ours am: 694e6f11 -s ours
  [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 01ea2f91 am: 849979c2 -s ours am: 68e2b332 -s ours am: c856b339 -s ours am: 15c0493b -s ours am: 439180a1 -s ours am: 53548280 -s ours am: 821af08f -s ours am: 707d2f68 -s ours am: 192fa6e3 -s ours