[automerger skipped] Merge "Guess the right encap/timeout for the VCN" into udc-dev am: a9a21d4bf6 -s ours
am skip reason: Merged-In Ia52db359691f6076ed04dc9108c26410c7aeb372 with SHA-1 995dda7648 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22954381
Change-Id: I687192783b181299136ed7a022462efd4ef3806e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: