Fix testing with/without connectivity module am: 3b81323e4a am: 4007947307

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

Change-Id: I4ad88eaa1492bc3bd2076de9a762cbe6cb8f481b