Merge "Convert GsmConference into more generic TelephonyConference." into lmp-mr1-dev