Merge "Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9 am: f4ff2d13bb am: 90e6d3ea98" into rvc-qpr-dev-plus-aosp