Merge "Telephony: Fix config to reflect the correct CM conn type."