Adds CNAP name filtering based on CarrierConfig am: bf1c69432a am: 35d58c7d74
am: bca6361f1f

Change-Id: If33185d03dfb8e53491170f402ffaa624f8be03b