Refactor `PredicateBuilder` from singleton to instance
Merge pull request #17886 from mrgilman/refactor-predicate-builder

Refactor `PredicateBuilder` from singleton to instance