Merge change 23427 into eclair

* changes:
  Moves GoogleLocationSettingManager to its correct location.