Merge changes from topic "am-14ed19b72f5e4f5da885ac33b6ade804" into tm-d1-dev-plus-aosp

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