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

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



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