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

am skip reason: Change-Id I60a7609833100347a2ab2c86f82680044f8367b5 with SHA-1 a95c44e295 is in history

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

Change-Id: I00c30758237639fff7fe626221d27d734533ba7b