CarrieMY authored Aug 28, 2021 and Marge Bot committed Sep 13, 2021

This patch follows the rules specified in note [Constant folding through
nested expressions]. Modifications are summarized below.

- Added andFoldingRules, orFoldingRules to primOpRules under those
xxxxAndOp, xxxxOrOp

- Refactored some helper functions

- Modify data NumOps to include two fields: numAnd and numOr

Resolves: #20203
See also: #19204