[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 96c8cb6803 -s ours am: 442e40bdac -s ours am: 9df963d086 -s ours

am skip reason: Change-Id Ib34eeeec78bac123a4936885042c0131e6ccffec with SHA-1 2714460ecf is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/12469820

Change-Id: I6e66d88d114fa99bdffc926aa81287dd73eef3f6