[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 -s ours am: 9ea6e277 -s ours

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

Original change: undetermined

Change-Id: I4aaf85651099c3b22f6bdd6c6c04b3075103bfc2