Merge "Move Proxy, PacProxySelector out of Connectivity" am: ae171d864d am: b6c5e099b5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4cc62d59b1da5053a4af976e30d411d8f066bbcc