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

Change-Id: I4817ec688583cfdf04262b21494c73dd8b67ccfc