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

Change-Id: Ib778417a49febcedc112b295f64431bb452619b0