Merge "Disable RTT when roaming" am: 2de4c0e40e am: 4f3c331857
am: 1a0ea0ff0a

Change-Id: Ic7aa3753af48808f1e37c2b0e3389101aaf4d25e