Merge "Rename getVpnRequiresValidation to isVpnValidationRequired"