Merge "Guess the right encap/timeout for the VCN" into udc-dev am: a9a21d4b

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



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