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

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

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