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

Change-Id: I452ea286e6cda9d5658b30df949f1b2cea3bb4ec