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

Change-Id: Idaa23641c8e95890271c554dee0244702601a109