Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo