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

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

Change-Id: Ic81a3604724855233dffc4e989bcee69feb8d91c