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

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



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