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

Change-Id: Ib6285780806a9bbffc9bb302085e78f72c27b1be