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

Change-Id: I62b9ef24f3a7f9fe75450a05d19dffda3b84d4b5