am df0dded1: (-s ours) Merge "Telephony Capability-Distinguish dialing & connect - DO NOT MERGE" into jb-dev-plus-aosp

* commit 'df0dded1e74e7394b79b03327dcec8a0b565838e':
  Telephony Capability-Distinguish dialing & connect - DO NOT MERGE