Merge "Captive portal login shows specific network name"
am: ea7322d17e

Change-Id: I48abfa9523854ea3f30883e92d6d3011d41c6a66