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: I4b66f7f3ad0a49d80e4d501cccc988cd11b37b37