Merge "[BiometricsV2] Fix skip action for udfps enrolling" into main