[automerger skipped] Merge "Add carrier config for allowing merge of RTT calls"
am:f99b67b657-s ours am skip reason: change_id I8cfdf68c69b50abed88d7c835db0480a53755f5a with SHA1ef80008000is in history Change-Id: I61fcd654239fe938cc4a4afd05edefb55e599b42
This commit is contained in: