Adds CNAP name filtering based on CarrierConfig
am: bf1c69432a

Change-Id: If2b9d1c7968e9eba9b02c1764db2e95913399610