am 829519df: Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f automerge: 5716ebe

* commit '829519dfaab9f2c13492d97556a95300a6908ea4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.