Merge "Remove expectCapabilitiesWith and Without" am: 2a6c2e0160 am: b5dd8b926e

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

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