Merge "Fix LinkProperties exclude routes tests on user builds." am: b64aeade58

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

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