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

Change-Id: I55d0768c9eeecb7dcce97c6d6390e339d678d0c4

Conflicts:
	core/java/android/app/ConnectionSettings.java