Fix testing with/without connectivity module am: 3b81323e4a

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

Change-Id: I47ec700b2ffb852a74ec5fea0640ea95e3e223fd