Merge "Add android.settings.BIOMETRIC_ENROLL action intent"