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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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