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

Change-Id: I0174124cad9c108a26594b0ddd6162ca3ea6e68d