[automerger skipped] Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4 -s ours

am skip reason: Merged-In I33f14f2d0f71013a594fd4c8c3914a590d30ea06 with SHA-1 1117e853f9 is already in history

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

Change-Id: I23169713305bb320dda331cfb37c97959c4cfb20