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

Change-Id: I0b49f04332405979193bbf69d0c79d90ee3a0a50