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

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

Change-Id: I6da755077fd8a6bebb8209f0d747e0d54b988c48