[automerger skipped] Merge "Fallback if redirect url is not valid for captive...

[automerger skipped] Merge "Fallback if redirect url is not valid for captive portal login" into rvc-dev am: 72b7075e am: 55971628 am: 99a74591 -s ours

am skip reason: Change-Id I6126f5aeb4709a09ec249947b5e59f1310ec7a4b with SHA-1 ffaef493 is in history

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

Change-Id: I10bcfb415844e988fad9f88e1a7fdfd440c81295