am 25acdffa: am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev

* commit '25acdffa23be41c4e49021153983d67e9fa48e38':
  Remove hide_carrier_network_settings from Settings.