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

Change-Id: I03f735df43f1599f3614a0ca9e3ea615a17772a0