Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395 am: 2bc66bf601 am: b52989c736
am: b0977f52a6

Change-Id: I3c1db8b94e35bc4bb3df17fa2e6e1a3af6683e4a