tree eba655b3c7e11e4a714cdcc883bd4a4811e47d37
parent e03f77170acaa48fb89cbf11f1efc3d5c008ce15
parent c7037475fa617479af9cd750d9c27a27dcb665c0
author Aaron Huang <huangaaron@google.com> 1637559694 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637559694 +0000

Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885529

Change-Id: Id685a51b37d59a822aaa9307f9d4b55053211612