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

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

Change-Id: I2f4a689aae9dafbad0bb5e3cd74f43a5c72fd898