Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9 am: b673f56578

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11853983

Change-Id: I2f5f9a77b409a457eda25ed10a598a8aabd29821