Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9 am: f4ff2d13bb am: 921c37cab0 am: cde5d67e8a

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

Change-Id: I30d6ea0857f3a5e601abb9a5e816803c4337ea69