am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type.
am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type.

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base