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

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

Change-Id: I106414a0416cda31e74092a5d8638936eded6e9a