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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief95eb9acecae14b6d79fe000391a4d17cf2ccc9