Merge "Popup a notification after logging in the captive portal network"
am: 6fa3d391b8

Change-Id: I78321e10014525dfb02da29ee2f3cd4487bf30db