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

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

Change-Id: I0d2e35da256e57dc79ee2b3d08cf62f89e9c9cf0