Merge "Disable RTT when roaming"
am: 2de4c0e40e

Change-Id: Ifb2d2d8a9de03a15a981af008a02a729d177c04f