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

Change-Id: I27f11e69898036380e8f4b04bad41cf88bcca98a