Merge "Test the encap/timeout for the VCN" am: e50f1464bb am: af6249f172

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

Change-Id: Ie85a59189f8f29c4151ba2177c09f81322a464eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>