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

Change-Id: Ia35252ae72c26b29db792a870c4537b2cd6ddddb