Merge "Remove expectLinkPropertiesThat" am: d500f20f90

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

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