Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)"