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

Change-Id: I05d36dd6cde1b304a3d67aec51ef2bb83f478854