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

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

Change-Id: Id67ccd5137a18f73d7d7e941270d7aded1e658c5