Merge "Fix system_server crash while iterating CookieTagMap" am: dd5a31eb2d am: c1124eff5b am: 5f3045cae7

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

Change-Id: Ic459069134734d7bf80b45bb6acd2a9fded4afbb