Merge "Allow third party cookies in the captive portal login app." into pi-dev am: 89868f29d0
am: bcb1fb3570

Change-Id: Ie328d2b68764acfdffa45fd713b2d82db2eb1376