Merge "Mark RTT calls as non-conferenceable"
am: 83f171da21

Change-Id: I4524b5c6a153b9346363130a89f495b6f2a46dce