Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
am: 9cac4568e5

Change-Id: I6b1d09378a0a9a82c0ac397ed920ae633232f044