DO NOT MERGE: CaptivePortalLogin: set mixed content policy to compatibility....
DO NOT MERGE: CaptivePortalLogin: set mixed content policy to compatibility. am: b55bf383 -s ours
am: d1c92f25 -s ours
Change-Id: I441369366958f6bc55776a4f449715103ed61cc0