[automerger skipped] Merge "Exclude user build devices for the test" into main am: 3f8cb43ff1 -s ours am: 48f3d98453 -s ours

am skip reason: Merged-In Iaaca422cb105c00ded1d84b40afd745abcd651b7 with SHA-1 523eeb3c87 is already in history

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

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