Merge "Merge "Test the encap/timeout for the VCN" into udc-dev am: 6ad488296a" into udc-d1-dev am: edacc8dac1

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

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