Merge "[Mainline] ProxyInfo migration" am: 1e54b66db4 am: 905e9e7f55

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1521964

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia91eff3fc951c2c1c778331aebe822b21287b972
tree: 82de4f0b13a0303bf364c66970316f710444ccbb
  1. staticlibs/