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

am skip reason: Change-Id I0d2e660fd93ef3ddba63e46b3ac369996c151669 with SHA-1 9eee380073 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/protobuf-codegen/+/12469779

Change-Id: I2ceea0b0d97a6053e15e0a00f78f9a57fcf2c25d