Merge "Fix LinkPropertiesTest on *-user builds" am: da53636d7c

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

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