Add 2G/3G option to profile connections (2/2)

Change-Id: Ib225366c63ae928f23afd5bbe8b5f68818a4976b

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml