Merge "Update Test to backfill Event/Gauge metric data" into stage-aosp-sc-ts-dev am: 8af86222df

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15554993

Change-Id: I5946c6d185f40782d3afb50e796047d6c1d1dd0e