Merge "Supported two RTT calls at same time."
am: 0ce1724713

Change-Id: Ic57e9696fd3165952459835d2fd7abc692e3fb5f