Merge "Fix the ANR on WifiMetrics" into udc-dev am: 83934035f5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/23719229

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