Merge "Ensure fingerprint setup is shown once after face" into sc-dev am: 6850b70226 am: 6e416b92dc am: 4e6f59ad9d

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

Change-Id: I2bcc7ac6ff6965e6880992ee5f336eb269bf9c62