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

am skip reason: Change-Id Ibef2872f7425b3f61fca2e06f15b6953677e4f20 with SHA-1 2c528fc5f1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/codespan-reporting/+/12469875

Change-Id: Icd5b0bff0c9987ce9f76d4c2570eea541b789c68