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

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

Change-Id: I2fa72d36a4fe6ae3c4a1a41eb7ea40dceb38f9d5