Merge "Adds CookieManager methods to configure policy for cookies for file scheme URLs"