Merge "Move Proxy out of framework-connectivity" am: 0a63677b56 am: 8357e960fc am: 290d6e3d03

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1611877

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie30e871c6c5ad17bcd554ed9def9170b2ed5ef2d