Merge change 21492 into eclair

* changes:
  WifiService: Hash based on both SSID and BSSID in scan result cache.