[automerger skipped] Merge "Fix LinkProperties exclude routes tests on user builds." into tm-dev am: b96f089312 -s ours am: f7e66df29e -s ours

am skip reason: Merged-In Ie0e2f6761b90a65813ed3610c7b5e930a9fdc982 with SHA-1 1bb94a3490 is already in history

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

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