Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd am: 24912bb93d
am: 41415facc8

Change-Id: Ic93c6170813b8c43176d57b534e405500c4639c1