Merge "Remove expectLinkPropertiesThat" am: d500f20f90 am: b91e763257

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

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