Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev am: 076dc5ee1b am: 77556bcc51

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16325466

Change-Id: I9c84fbac19a764c012168110db04832a4bf58e92