Merge "Remove expectCapabilitiesWith and Without" am: 2a6c2e0160 am: 5db74ec0b5

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

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