Merge "Dismiss RTT request dialog if RTT is already active." am: 875c43fa97
am: a329275ab6

Change-Id: I856f580faaca433003d8d3b76cba9a67af7b31a4