Allow merging of RTT calls based on carrier config
am: 96d0458373

Change-Id: Iffa2ff0e52fa57836156ce8f57430839ff3f0a8d