Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa

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

Change-Id: Iac952ca15e14b107409b8470b087aceafb06021f