Merge "Add simplified_network_settings_bool to CarrierConfig."
am: 4ce798f45f

Change-Id: I7343422cd3405628d6c2b90092af631b77eb37a7