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

Change-Id: I0fc643a80141b24e391cac937f87336378a2852f