Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: a46e5911ee am: e0ca014302

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

Change-Id: If60a348768c507153c1a9038953b2f6c29fc8f03
tree: 656dc04866e7508cd1522b6d887d8e334e6e1f43
  1. core/
  2. services/
  3. tests/