Merge "Merge "Merge "Merge "Fix broken CTS test: WebSettingsTest#testAllowMixedMode" into lollipop-mr1-cts-dev am: 41f9bbd81a" into marshmallow-cts-dev am: 0b3c00dc92" into nougat-cts-dev am: af8caff2fd" into nougat-mr1-cts-dev