Merge "Revert "Cookies: Add targetSdkVersion based compatibility for domain matching.""