Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902
am: 715acea102

Change-Id: I44bc0113697be113ef79ac9a904485b49bed2f87