Merge "Allow third party cookies in the captive portal login app."
am: be6d45fe92

Change-Id: I5cb87e87aa64aebebfd9969dfb1ddbf02418b174