Merge "Add carrier config for allowing merge of RTT calls" into qt-r1-dev am: f84ff34a31
am: bbb0db164d

Change-Id: I31d305880421befa704bbdd43d799c6d9881b7d9