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

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

Change-Id: I6da755077fd8a6bebb8209f0d747e0d54b988c48
tree: fcdd993e5cc788a22f270bc3d557bd8eff77836d
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/