Merge "WifiManager: getScanResults fix javadoc"