Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: 28ced6a6ca am: 251d68487e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757

Change-Id: If60a348768c507153c1a9038953b2f6c29fc8f03
tree: a6e7fe2400d39353d86f84eb2d9877d61e45f81a
  1. core/
  2. packages/
  3. services/
  4. wifi/