Merge "Combine customBiometricPrompt() with constraintBp()." into main