Merge "Captive portal login shows specific network name"
am: 01fb05cf62

Change-Id: I205b37d204250d7fc188b2d7d23593d22d03b89d