Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev