Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902 am: 715acea102
am: dfee8e5f2d  -s ours

Change-Id: I20a62e19cd4c7645122822da41a3693f4fc584f8