Merge "[Mainline] Migrate ProxyInfo" am: ea935361d5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic839f183b48279532dcfb484818457a5372087b2
tree: 846daa05866167f27dabcfe23e1f6a958be39482
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS