Merge "Fix failure in BiometricsSafetySourceTest" into main