Merge changes from topic "am-de93e37eb41d405b971292fc99ae76a3" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] adjust for newly added bpf map/prog definition fields in T+ am: ce6cdc8e16 am: ef57c5c770 -s ours
[automerger skipped] netd bpf program - use finer grained selinux privs, part 1 am: bda7ced5be am: 28423817c2 -s ours
[automerger skipped] switch netd_configuration_map from hash map to array am: 9017a07049 am: 695d386d4e -s ours
[automerger skipped] verify CLAT_MARK matches aidl constant. am: 586cff5b44 am: 62532e5040 -s ours
[automerger skipped] bpf_progs - eliminate netd.c dependency on UidConstants.h am: d1b3b02c27 am: 866420c61b -s ours
[automerger skipped] netd.c - reduce privs on maps am: 30e5476746 am: 5e8d2f3de9 -s ours
[automerger skipped] BpfHandler.h - switch mStatsMapB from BpfMap to BpfMapRO am: eb9b6fad4e am: a53565b4f3 -s ours
[automerger skipped] bpf programs: switch from integers to #define'd bpfloader versions am: b6efc7f168 am: c451e57fe0 -s ours