Merge "Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1 am: b673f565" into rvc-d1-dev-plus-aosp