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

Change-Id: I22fc36d66e388a023a2f5adb133d70c79570d9a3