Merge "Fix LinkProperties exclude routes tests on user builds." into tm-dev am: b96f089312 am: d675a49f5f

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

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