tree 846daa05866167f27dabcfe23e1f6a958be39482
parent fa2f9f4eee946f2dea2fc1a0e2df06aa5eac5b86
parent 872ac951ccd273aa8bfd914bc044cf1247f79626
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: ea935361d5 am: 872ac951cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d