Merge "Merge "Refine validation metrics" into rvc-dev am: bf45240a am: 63e923ab am: e99c5ee2" into rvc-qpr-dev-plus-aosp am: 6fc59f0a am: ad83e028

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

Change-Id: I4003cd1ba7e278829cff6f37bf3c09007aeb82de