Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406 am: 7366c89d64 am: da756e286b am: b4218b8d31 am: 7d841ca67d

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

Change-Id: Ic6c3c6717b3ce5581c9d95fd656621960485fbba