tree fed683f3b4edf94948bdb5816cf38acd3bae5374
parent feaf7a261e489d9655b26f91038d74435c632f4c
parent 9b3f669024102872cc3e593b83db74a45305e296
author Serik Beketayev <serikb@google.com> 1608889554 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608889554 +0000

Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 9b3f669024

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d