Merge changes from topic "am-9a960a4d467e4f7390805f1ddabcce24" 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: 9c643e5f -s ours am: c864aed8 -s ours am: 6128178a -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: a80d2716 -s ours am: c3e521c5 -s ours am: cf502d92 -s ours