Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev