Merge "Do not use Map.Entry outside of lock" into udc-dev am: 4aa81f11 am: 3ba47873

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



Change-Id: If64e8c73bdab7d7c917dd9d3d80084659c50f1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>