Merge "Improve TestConnectivityManager readability" am: 883df67f3f

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

Change-Id: I755a697fd3170853598dad692728994805e9b36c