Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03f

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

Change-Id: I98d9a9a04064e9d599f33ee585f020bdd6c248a7