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

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

Change-Id: Ic459069134734d7bf80b45bb6acd2a9fded4afbb
tree: 61c2f87590901def74f762e3f0ac52a9ec2801cd
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/