[automerger skipped] Merge "Add aware metrics" into tm-mainline-prod am: 629977360f -s ours

am skip reason: Merged-In Ib6d4e43bdccaf4b654b15cbec6f675764be782ce with SHA-1 8fa30e8dfc is already in history

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

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