Fix NT_MODE case statements

These changes are necessary because of a RIL bug. Network Mode 7 is
LTE/CDMA for Verizon, which maps to the const NT_MODE_GLOBAL. This
allows the network mode to be changed.

Conflicts:

	src/com/android/phone/MobileNetworkSettings.java

Change-Id: I7dae0684e475f3ffd33f767088a6de13c36caaa7
Merge branch 'cm-11.0' into martincz
Merge remote-tracking branch 'mokee/kk_mkt' into slimkk