Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev