am ea93d815: (-s ours) am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type.

* commit 'ea93d815ac33bf8ef0896b25fbf0185e6d6e82aa':
  Do not merge: Telephony: Fix config to reflect the correct CM conn type.