[automerger skipped] Merge changes from topic "t-oob-p-metrics" into tm-mainline-prod am: ea2a85f110 -s ours

am skip reason: Merged-In I4a536eebe69b3c388b57a5cde16e86408b0afbf3 with SHA-1 2a8ed5cfee is already in history

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

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