Merge "Upgrade rust/crates/protobuf-codegen to 2.25.1" am: dafb9684c4

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

Change-Id: I9a6dac30c06f6ac9ff55ddad4e7bcab70c298cb9