Merge "Merge "Refine validation metrics" into rvc-dev am: bf45240a am:...

Merge "Merge "Refine validation metrics" into rvc-dev am: bf45240a am: 63e923ab" into rvc-d1-dev-plus-aosp am: a03164b7

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

Change-Id: I403cd83a0cf35b0caa921129d0be8895139d160e