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

Change-Id: I7c147cf575e1040a82a7fe05a97a45e06108b010