Adds a CNAP filtering field to the CarrierConfig
am: 5ea6b1ece9

Change-Id: If76215daaf2b2c2a200459a63302249be07b2f1b