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: I9c55278231bb2fb09745e5c19b3b915fbba46933
tree: da832f5c55280fe2e3d29490ce15e5171c4cf2a9
  1. staticlibs/