Merge "bpf netd: pass sdk level into bpf_traffic_account()" into main