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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb4ce68cb4eb994ac546dcc8d90f0527681ea2ef