Merge "Stop using CaptivePortalData in the shim interfaces." am: ee6648c467 am: 5478c66890

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4b150de012d98b71982c0bec4db3a29f198c0eb