[automerger skipped] Merge "Guess the right encap/timeout for the VCN" into...

[automerger skipped] Merge "Guess the right encap/timeout for the VCN" into udc-dev am: a9a21d4b -s ours am: 9ee11235 -s ours am: 62a83140 -s ours

am skip reason: Merged-In Ia52db359691f6076ed04dc9108c26410c7aeb372 with SHA-1 995dda76 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22954381



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