Merge "Increase the wait timeout for meteredness to change." am: edb6669cf1 am: eccfb47e5b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f843b19c377d54a9a6957080ccc93fe91e082e5
tree: 738d61fdc5109080e6037e60d8ae2120f7336a62
  1. framework/
  2. tests/
  3. Tethering/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg
  7. TEST_MAPPING