Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406 am: 7366c89d64

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

Change-Id: I06a57233672809b97495c0a11dec0282f1439347