Changes for the 2g and lte toggles

Conflicts:
	src/com/android/phone/PhoneInterfaceManager.java