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

Change-Id: I6392862052ca0043957ea086a32b6d875f469b53