Merge change 22611 into eclair

* changes:
  Hide the "Enable Assisted GPS" checkbox in security & location settings.