[automerger skipped] Guess the right encap/timeout for the VCN am: 0eec13f3 -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: Ie5207f77205abcd2c89f83cfb1ce61e5dee05d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>