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

Change-Id: I6d24cd7b81926593edaa29c6eaff48b290deb5c7