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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9908365b2393fd718bd1a5cda4d6839bc96eb869
tree: 9bf48be1cc4b10368332c2623ef20c605bbd73b4
  1. framework/
  2. tests/
  3. Tethering/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg
  7. TEST_MAPPING