[automerger skipped] Merge "Allow merging of RTT calls based on carrier config" am: 42f3e123cf -s ours am: 7921eab285 -s ours
am: 35e62bf59e -s ours
am skip reason: change_id Ieacc342beff0ee51cad022a0b00ab1324ec8f3b4 with SHA1 96d0458373 is in history

Change-Id: I1bc7b8acf93c3cfbd1f8714254b1cf09b50f37ec