Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev