[automerger skipped] Update ProxyInfo(String) to ProxyInfo(Uri) am: 76dbd9c374 am: 1049455652 -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: Ic1e0cc2dfea80a6dace987e4bcf9801a7a7b7cdc
tree: 7ca3837df20bdc5bd2a9343161fa3c261ad90b69
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg