Merge change 22453 into eclair

* changes:
  Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.