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

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

Change-Id: I4cb959a2a5f99930fc1aa803c43cf88d13be1d5b