Merge "Fix test failure in BiometricsUnlockControllerTest"