Merge "[automerger skipped] Merge "[DO NOT MERGE]Update stats_log.proto for cts backfill" into android11-tests-dev am: 707f458542 -s ours" into android12-tests-dev