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

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

Change-Id: I94eb114d484a02038927f67e08309c60b539100f