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

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

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