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: Ied24d14d87c99e12071212e4bfece0e404fd2973