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