We can merge this now that: https://googleplex-android-review.git.corp.google.com/c/platform/system/netd/+/20284735 'bpf_base_test - unconditionally run TestSocketFilterSetUp' has been pulled into tm-mainline-prod. Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I1b65cd41ce7b4eaab7f1fead2742c72e48294244