Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic839f183b48279532dcfb484818457a5372087b2
tree: fed683f3b4edf94948bdb5816cf38acd3bae5374
  1. core/
  2. services/