Merge "Don't send RTT upgrade request if already RTT"
am: e701e84f41

Change-Id: I367ed548e053adc423d65b37662bf71f0e3377fa