Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 5565118666 am: 40e7949c5f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6f5bf74bf461f762472ea1d88553db3b9719c80