Merge changes from topic "am-edab55e843ed4ad9aadca12edf8bcb21" into udc-dev-plus-aosp
* changes: [automerger skipped] Merge "Guess the right encap/timeout for the VCN" into udc-dev am:a9a21d4bf6-s ours [automerger skipped] Guess the right encap/timeout for the VCN am:0eec13f3e6-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
4185a2f467