Merge "Upgrade rust/crates/protobuf to 2.25.1" am: 6df3dff7d6 am: bfcacb22f0 am: a5b5351076 am: a405e7fa8f

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

Change-Id: I6c6d57871300888ffce77f9e3dfb7dec00043d78