Merge "Adds a CNAP filtering field to the CarrierConfig" into nyc-mr1-dev