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

Merge "[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" into rvc-qpr-dev-plus-aosp am: bbc55374 -s ours

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

Original change: undetermined

Change-Id: I3dae88f9aa39d809a89f1c02f476950eaec6f791