Merge "[Mainline] Migrate ProxyInfo" am: ea935361d5 am: 872ac951cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d