tree 12d744d429d46308980698d001b87563a9188060
parent 9b23f59e339a0eec54ee8e7cb86427098cb48f41
parent 9b5f78886d64d648fb57958efd49828e6dd3dad2
author Remi NGUYEN VAN <reminv@google.com> 1613662112 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613662112 +0000

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