Fix criterion for non-rev trips

[binh-dam-ibigroup]

Checklist

• Appropriate branch selected (all PRs must first be merged to dev before they can be merged to master)
• [na] Any modified or new methods or classes have helpful JavaDoc and code is thoroughly commented
• The description lists all applicable issues this PR seeks to resolve
• [na] The description lists any configuration setting(s) that differ from the default settings
• All tests and CI builds passing

Description

This PR fixes the criterion for a revenue trip, where the pickup and drop off types were incorrectly required to be both-not-unavailable for a stop time to be considered a revenue stop.