Merge "Fix broken CTS test: WebSettingsTest#testAllowMixedMode" into lollipop-mr1-cts-dev