Merge "Fix system_server crash while iterating CookieTagMap" am: dd5a31eb2d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990333

Change-Id: I04bd616a62ba77219c0ae812d2337e474b1fe2c2