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

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

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