Merge "Add text to RTT setting when roaming" am: c7e4274759
am: 2ab4f3283f

Change-Id: I135622cd3113caedf37dab234a080041420a9bc0