Merge "Add test for ConnectivityManager.setGlobalProxy()" am: 78c1663ba3

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

Change-Id: Iaf40a7004a6305ad86b985695bfe4a9ee9038c96