Merge "Adding null check to prevent NPE" into tm-dev

            CharSequence title, CharSequence description, int userId,

            boolean disallowBiometricsIfPolicyExists) {

        Intent intent = this.createConfirmDeviceCredentialIntent(title, description, userId);

        if (intent != null) {

            intent.putExtra(EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS,

                    disallowBiometricsIfPolicyExists);

        }

        return intent;

    }