Merge "Remove expectLinkPropertiesThat" am: d500f20f90 am: 9fad37c99d

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

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