Merge "Deprecate ACTION_FINGERPRINT_ENROLL and add ACTION_BIOMETRIC_ENROLL"