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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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