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

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

Change-Id: I938d9b1b032b4d4225f59c0edb69b01cad1f2056