Merge "Attempt to reduce flakiness of ActivityMetricsLoggerTests" into rvc-dev