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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58dfc2fc7cf868c8f6864bd01da5d80cae376bc1
tree: 12d744d429d46308980698d001b87563a9188060
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING