Merge "Deflake CaptivePortalTest mobile data usage" am: 1a16358c36 am: 9b5f78886d am: 0e251f7a8e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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