Merge "adjust BpfCompatTest now that clatd & netd bpf program have been mainlined" am: e0904b5a12 am: ed96e31624 am: be9f984fb6

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

Change-Id: Ic320346b8713f6b0a90f5ef84864481c1580606a