Merge "Fix the usage of FILTERED_CNAP_NAMES_STRING_ARRAY"
am: 2b904fdbf0

Change-Id: Ic513b21ee149c043b4c034bc298d0107d7239f99