Merge "Hide carrier network settings if HIDE_CARRIER_NETWORK_SETTINGS is 1." into lmp-mr1-dev