am e9506e36: Merge change 25561 into eclair

Merge commit 'e9506e3684c36a62533211022541997034088d2f' into eclair-plus-aosp

* commit 'e9506e3684c36a62533211022541997034088d2f':
  Add Gservices settings required for carrier billing.