Merge "update CookieManagerTest.java" into froyo