am 2a1e9641: Merge change Ie122606f into eclair

Merge commit '2a1e96412c66f22939c010f10524122718c7bbeb' into eclair-plus-aosp

* commit '2a1e96412c66f22939c010f10524122718c7bbeb':
  Add code to use Gservices provided values for throtting NITZ updates.