am 595787d0: Merge "Fix issue where GSM conference is held in...
am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev
* commit '595787d0':
Fix issue where GSM conference is held in makeRoomForOutgoingCall.