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

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

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