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

Change-Id: I46598799c8a21d986d1790afc5c4b01726081e97