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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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