Merge "Fix system_server crash while iterating CookieTagMap"