am 5359b499: am bef8881a: Merge "Fix parent call not being identified as a conference call" into klp-dev
am 5359b499: am bef8881a: Merge "Fix parent call not being identified as a conference call" into klp-dev

* commit '5359b499d18a1e4e33e58c4564c16a855e392627':
  Fix parent call not being identified as a conference call

md5555/android_packages_services_Telephony