Merge "Remove expectCapabilitiesThat" am: f1aeb1051e am: 0825e5bd43

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

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