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

Change-Id: Ida145851260c8f34c3eace7eba9b67a493314e7b