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

Change-Id: I2afa42d434f76aaffb5dac7744912ee358791db5