Remove captive portal code that has no effect. am: 605bb642f0

Original change: undetermined

Change-Id: Ie6ec595f99feb31a92b83a75bf108286a83cd879