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