Merge (-sours) commit '8e382d750026f4519d0bc69326be1d845ff33bed' into HEAD

* commit '8e382d750026f4519d0bc69326be1d845ff33bed':
  Enforce GsmUmtsOptions only be called for GSM Phone.
  Add two more placeholder "policy" methods to TelephonyCapabilities.
  Cleanup CDMA versus GSM behaviors in DTMF dialer
Merge commit 'd3a8a3a138614071a7a8020e1579048c411abd78' into HEAD

* commit 'd3a8a3a138614071a7a8020e1579048c411abd78':
  Cleanup OTASP use in OtaStartupReceiver.

Conflicts:
	src/com/android/phone/TelephonyCapabilities.java
Merge commit '98cdd546ec6b9224863ecef92307496761067cc6' into HEAD

* commit '98cdd546ec6b9224863ecef92307496761067cc6':
  Clean up "ECM == CDMA" assumptions.

Conflicts:
	src/com/android/phone/PhoneUtils.java
Added support for Changing Phone network mode
Todo: Add permission control

Added permission control for the 2G/3G switch

Accept switching to NT_MODE_WCDMA_ONLY network mode

Change-Id: I33f612f523a6a9d41aef65c12148aaec98e5afcc
Phone: Double check mode before changing

A modem might report world phone mode when it really is only GSM or
CDMA capable, making the system switch to an invalid mode which
will later break the telephony code.
This simple check enforces the world phone overlay which is already
in place and will only consider it a correct value in that case.

Change-Id: Iedbc529497b2779f3a12ff56ca1b028cc9434227
Remove user tag