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

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

Change-Id: I0d9432f9b96e7150749b6cfdbd121465b58922d7