Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: e0e7517693 am: 17fa6d8219

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6f5bf74bf461f762472ea1d88553db3b9719c80
tree: c6f63d5801fb9212558bca09bdc55b2704787ff1
  1. core/
  2. services/