Merge "Avoid saving result from WeakHashMap.size()" into udc-dev am: 5a4d1bd9

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



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