Merge "Move Wifi-calling setting to Call settings" into mnc-dev