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

Only show option when network type is GSM not CDMA

Change-Id: Ib225366c63ae928f23afd5bbe8b5f68818a4976b
Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
privacy guard: Fix crash when uninstalling an app

 * Don't try to update the privacy guard flag while refreshing after an
   uninstall since the PM will throw an exception at us.

Change-Id: Idadb99fefc2861e871f6206b08c844dda742fa68
Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	src/com/android/settings/applications/InstalledAppDetails.java