Merge pull request #8934 from ian-liu/ril/Bug845629_change_mnc_mcc_type_from_integer_to_string

Bug 845629 - [Gaia] change mcc/mnc type from integer to string. r=kaze(cherry picked from commit 96a236d8a4c47447a4a16be60c1b457d7254acf9)

Conflicts:
	build/settings.py