Merge "Make MTS verify expected BPF programs based on OS version." am: 08a2e03231 am: 6b32916396

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

Change-Id: I38110b33c7f72b73ebc9bc199b8156b8a4282bbb