Fix testing with/without connectivity module am: 3b81323e4a am: e4455f91f7 am: 478536dd1d

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

Change-Id: I3b546de3356e9ad75c70c6f884c268c7f609809b