Merge "Improve TestConnectivityManager readability" am: 883df67f3f am: 265ec28e25

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

Change-Id: I3b2a5a3f826cb6f3a9f78f1ed6413a93c007ae68