Merge "Strip separators while sending CLCC response" into nyc-mr2-dev
am: 08a1123574

Change-Id: Idd3bcaee3175e94e812d5e43f6ebbd3cb57a8a7e