Merge change 22440 into eclair

* changes:
  Java-side changes to persist Geolocation permissions between browser sessions.