[automerger skipped] Merge "Refine validation metrics" am: b5325bb1 am:...

[automerger skipped] Merge "Refine validation metrics" am: b5325bb1 am: 7f24a494 -s ours am: 785bd04e -s ours am: fe487fd4 -s ours am: b22fec98 -s ours

am skip reason: Change-Id I06d6dccc57146b955b15cf36a2109c68a5355494 with SHA-1 7b6435fd is in history

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

Change-Id: Iab105baa659ecc8213af99d34e93f898ff5370c0