Merge "Add tests for in-kernel VPN/VCN dataplane" am: 64619cabc1 am: 4793a34212

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

Change-Id: I00d5f65c63c9900be64c304dddb513382c4e679c