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

Change-Id: I06dcc86f7e11e0db205f712b41dd3e7d0194bb36