[automerger skipped] bpf_progs - eliminate netd.c dependency on UidConstants.h am: d1b3b02c27 -s ours am: 07c9ff9852 -s ours

am skip reason: Merged-In Id464fc2418efcb3764fae2a25c11fdda4439f411 with SHA-1 b909d8af55 is already in history

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

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