[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0d58a4fb46 -s ours am: ed6e85c6f1 -s ours

am skip reason: Change-Id I22d17e1d7b5db1e8451b6754a652e7069378f3f1 with SHA-1 aa4a4dc377 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-trace/+/12469317

Change-Id: I21e499fc71f8a5255141c58c1b3e154a0c037827