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

Change-Id: Icd9f5d72f05c54e59fcf2baedadc0ed3fab04204