Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa am: 1d5bf4bf1a

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

Change-Id: I12a5e7ba74856e4513288c676e1d7fb8e36ffd79