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

Change-Id: I14916ac03825bcfac65208aa2dfda26e7d7b8632