Merge "Adding unit test for TelephonyConferenceController"