Merge "Require internal permission for BIOMETRIC_CONVENIENCE"