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

Change-Id: If0002ed57f186ba0cb18a871482ef056c56bbf53