am 10b8e84b: am 803bf856: am db6ead53: am 3c326af8: am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev

* commit '10b8e84b8a231887ab3314bd0e0e61286dd94e55':
  Fix issue where GSM conference is held in makeRoomForOutgoingCall.