Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e am: 5463bbece5 am: 8f98e732a0

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

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