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

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

Change-Id: I95fe15f915551c479e9bf4e9defd70ac897bf35b