Merge "Class2BiometricActivity should request BIOMETRIC_WEAK"