Merge "Do not use Map.Entry outside of lock" into udc-dev am: 4aa81f11 am: 5b8045f7 am: da5d48b2 am: 27668184

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



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