Merge "Refine validation metrics" into rvc-dev am: bf45240a am: 4a9d1c53 am: 1a851793 am: 08b78a9a am: 4a150c1a

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

Change-Id: I6649b8e5654cd0d7541cac03a45ece3ab6bda7f2