am 6918cef8: Merge "Updating APIs for CDMA conference call support." into lmp-dev

* commit '6918cef8ab9adb03547f2933705a29d22c878598':
  Updating APIs for CDMA conference call support.