Merge "Remove expectCapabilitiesThat" am: f1aeb1051e

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

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