Merge "Remove expectCapabilitiesWith and Without" am: 2a6c2e0160

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

Change-Id: I3725e254f29b6c48e275510caa740c16f67ee68b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>