[automerger skipped] Update ProxyInfo(String) to ProxyInfo(Uri) am: 76dbd9c374 am: 1049455652 -s ours am: 835da001b7 -s ours am: 92a1c2d39d -s ours am: 397457be78 -s ours

am skip reason: Change-Id I6650e26d6f0a6455ded8a045c6c4efaa6dd7d742 with SHA-1 71c465f9dd is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/1146586

Change-Id: I00d9c5e636ddf373a87d2b91e4d17ce82105eb96
tree: c28833f239f96d15b17074cde9f8d8aca3b954ce
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg