Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa am: 4fc403c3b0

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

Change-Id: Id9b717824540504570de9b4c27503f04c2b41fda