Merge "Remove expectCapabilitiesWith and Without" am: 2a6c2e0160

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

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