Merge "Revert "Fix test assertion in HttpCookieTest for invalid dates.""
am: d5bb85d687

Change-Id: I425404183aad1e67ad23c8fe425a3edf48d18e28