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

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

Change-Id: I87baec1435f8e40ac96d6a0dff722f228c6296f8