Merge "Adds a CNAP filtering field to the CarrierConfig"