Merge "Fix flaky test by extending timeout" am: 2108eada65 am: e46d5eb40f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597473

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06a738c6a7d74951e3c13dd3cf557b4de88f18f2
tree: 71b51fe72adee0b04b355e5e480475e1d3eee06f
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING