Merge remote-tracking branch 'remotes/aosp/jb-mr1.1-release' into jb42

Conflicts:
	res/values-de/strings.xml
	res/values/strings.xml
	src/com/android/phone/PhoneUtils.java

Conflicts:

	src/com/android/phone/PhoneUtils.java

Conflicts:

	src/com/android/phone/PhoneUtils.java
Support additional LTE network modes

- Support all LTE network modes defined in RILConstants and
  com.android.internal.telephony.Phone.
- Enable LTE options for GSM LTE phones.
- Implement toggleLTE.
  - LTE/CDMA mode may be overridden with toggleLTE_lte_cdma_nt_mode.

Consists of (partial) cherry-picks of these CM 10.0 commits:

commit a8eb4dce7b19bfa74fbbde128336f93057133d97
Author: Mike Kasick <mike@kasick.org>
Date:   Fri Aug 10 18:04:44 2012 -0400

    Make "Preferred network mode" strings consistent, fix LTE modes.

    - Make network mode strings, comments, internally consistent with each other.
    - Show LTE modes only for CDMA/LTE and GSM/LTE devices, not non-LTE.
    - Revert to "Global" label for NETWORK_MODE_GLOBAL on non-LTE devices, to
      remain consistent with RILConstants, but also because this mode is used
      for CDMA/EvDo/GSM/WCDMA mode on global-capable devices.
    - Consistently show "CDMA / EvDo" whether on a CDMA or CDMA/LTE phone.

    This should be the complete superset of network modes supported on all
    devices.  Individual devices may prune this list to include only network
    modes that their radios support.

    Note, the "Global" mode label (preferred_network_mode_lte_cdma_summary)
    remains unchanged from its overloaded-to-support-LTE-on-toro capacity for
    consistency with AOSP, although though this overloading is a mess.

    Change-Id: I39bcf73474778a4d83753eddb5014642e41ab9b3

commit 9025baeddf9b7325e07605fca310fa897dcd9175
Author: dhacker29 <davidhackerdvm@gmail.com>
Date:   Tue Jul 10 10:59:01 2012 -0500

    Add NT_MODE's for NETWORK_MODE's 8 and 10

    as defined in RILConstants.java

    Change-Id: I225bb776152e4c63ade1f70669edb2df3986634c

commit a03ba4f3ea1c059d91aba747964314ab657d6842
Author: Ricardo Cerqueira <github@cerqueira.org>
Date:   Tue Apr 17 01:34:31 2012 +0100

    Phone: Enable LTE options for GSM LTE phones

    Change-Id: I580c37f3272c8cc8363e8db5b1c227bf6f74a04a

Change-Id: I326584e1f82cc84c244c23282b096a98703d4b1a

Conflicts:

	src/com/android/phone/PhoneInterfaceManager.java
Revert "Support additional LTE network modes"

This reverts commit 66d09322ac1899bd383444830d61b192783f1a9c.