Merge "Change representation of Wi-Fi calling setting to a String" into master-nova