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