[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 -s ours am: 12f7c22b -s ours

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

Original change: undetermined

Change-Id: If4739ed1ec20d0dc206bb191496bcf2d3d8ecbbf